Browsing by Keywords comprehensive improvement